Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 01:53:12 +0000 (18:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 01:53:12 +0000 (18:53 -0700)
commit2f06796f923aaff02587b31c4d4e634d5bcb1180
treea4d05551e3e5342fe7ec1950450f91ee52ff90d0
parenta8e7b62c85fd7a33fe6a3d751727ff4a80edc4b9
parent82605a84d4d6b336d5f08e7a835277dd5e8dbd0a
Merge from trunk.